Skip to content

Fix CI failures on MySQL/MariaDB#1034

Merged
dereuromark merged 2 commits into5.xfrom
fix-ci-failures
Mar 5, 2026
Merged

Fix CI failures on MySQL/MariaDB#1034
dereuromark merged 2 commits into5.xfrom
fix-ci-failures

Conversation

@dereuromark
Copy link
Member

Summary

  • Handle uninitialized Column::$fixed property in BakeMigrationDiffCommand
  • Fix CURRENT_TIMESTAMP test assertion to be more flexible with MySQL/MariaDB version differences

Fixes #1033

Problem

The 5.x branch CI is currently failing on all MySQL and MariaDB tests due to two issues:

1. Column::$fixed uninitialized property

When TableSchema::getColumn() is called on cached/serialized schema objects, the Column::$fixed property may not be initialized (it's a typed property introduced via constructor promotion). This causes:

Error: Typed property Cake\Database\Schema\Column::$fixed must not be accessed before initialization

Fix: Added safeGetColumn() helper method that catches this error and builds the column array manually by accessing properties individually with try-catch.

2. CURRENT_TIMESTAMP format differences

Different versions of MySQL and MariaDB return CURRENT_TIMESTAMP in different formats:

  • MySQL: CURRENT_TIMESTAMP
  • MariaDB older: current_timestamp()
  • MariaDB 11.8: CURRENT_TIMESTAMP

The test expected a specific format per driver type, but this broke with MariaDB 11.8.

Fix: Changed the test to use a regex that accepts all valid formats case-insensitively: /^current_timestamp(\(\))?$/i

Related

@dereuromark dereuromark force-pushed the fix-ci-failures branch 3 times, most recently from 14c2a06 to d5ae546 Compare March 1, 2026 13:39
1. Handle uninitialized Column::$fixed property in BakeMigrationDiffCommand

   When TableSchema::getColumn() is called on cached/serialized schema
   objects, the Column::$fixed property may not be initialized, causing
   an Error. Added safeGetColumn() helper that catches this error and
   uses reflection to initialize uninitialized properties before retry.

2. Fix CURRENT_TIMESTAMP test assertion for MySQL/MariaDB

   Different versions of MySQL and MariaDB return CURRENT_TIMESTAMP
   in different formats (CURRENT_TIMESTAMP, current_timestamp(),
   CURRENT_TIMESTAMP()). Changed the test to use a regex that accepts
   all valid formats case-insensitively.

Fixes #1033
@LordSimal
Copy link
Contributor

The BakeMigrationDiffCommand Problems are already fixed in #1026 as the schema dump files just needed to be regenerated in the tests folder.

@LordSimal
Copy link
Contributor

The CURRENT_TIMESTAMP change could be related to these adjustments I made
https://github.com/cakephp/cakephp/pull/19294/changes#diff-9d3023ce5f42fde0efb52e24ca67d2a6a5b3f68b36380c06114d05ab5f0bc1d8R235-R241

But thats because I wanted to make it more unified with all the other variants.

In general I'd rather fix the testsuite data instead of wrapping everything in a try-catch because I know exactly that method you added here as Codex proposed the same for me.


We shouldn't have released cakephp/cakephp#19207 in a patch release in the first place, then this would be easier to handle.

@markstory
Copy link
Member

The BakeMigrationDiffCommand Problems are already fixed in #1026 as the schema dump files just needed to be regenerated in the tests folder.

I thought that too initially, but with the code in the command file, it adds a workaround to the error for userland usage as well. We've had a few issues for this already, having a workaround solves the user facing issue at least.

@dereuromark dereuromark merged commit 944c4e2 into 5.x Mar 5, 2026
14 checks passed
@dereuromark dereuromark deleted the fix-ci-failures branch March 5, 2026 06:10
jamisonbryant pushed a commit that referenced this pull request Mar 11, 2026
1. Handle uninitialized Column::$fixed property in BakeMigrationDiffCommand

   When TableSchema::getColumn() is called on cached/serialized schema
   objects, the Column::$fixed property may not be initialized, causing
   an Error. Added safeGetColumn() helper that catches this error and
   uses reflection to initialize uninitialized properties before retry.

2. Fix CURRENT_TIMESTAMP test assertion for MySQL/MariaDB

   Different versions of MySQL and MariaDB return CURRENT_TIMESTAMP
   in different formats (CURRENT_TIMESTAMP, current_timestamp(),
   CURRENT_TIMESTAMP()). Changed the test to use a regex that accepts
   all valid formats case-insensitively.

Fixes #1033
dereuromark added a commit that referenced this pull request Mar 11, 2026
* add using when changing column type to json (#1031)

* Fix CI failures on MySQL/MariaDB (#1034)

1. Handle uninitialized Column::$fixed property in BakeMigrationDiffCommand

   When TableSchema::getColumn() is called on cached/serialized schema
   objects, the Column::$fixed property may not be initialized, causing
   an Error. Added safeGetColumn() helper that catches this error and
   uses reflection to initialize uninitialized properties before retry.

2. Fix CURRENT_TIMESTAMP test assertion for MySQL/MariaDB

   Different versions of MySQL and MariaDB return CURRENT_TIMESTAMP
   in different formats (CURRENT_TIMESTAMP, current_timestamp(),
   CURRENT_TIMESTAMP()). Changed the test to use a regex that accepts
   all valid formats case-insensitively.

Fixes #1033

* Fix TEXT column variants not round-tripping correctly (#1032)

When using migration_diff, TEXT column variants (TINYTEXT, MEDIUMTEXT,
LONGTEXT) were not being properly mapped back from the database. The
BLOB type handling already used rawType to distinguish BLOB variants,
but TEXT variants were missing equivalent handling.

This adds similar rawType-based mapping for TEXT columns in
mapColumnType() and includes round-trip tests.

Fixes #1029

* Add fixed option for binary column type (#1014)

Add support for the `fixed` attribute on binary columns to distinguish
between fixed-length BINARY and variable-length VARBINARY types.
This mirrors cakephp/cakephp#19207.

* Add test cases for fixed option on binary columns

Tests cover:
- Column class getter/setter for fixed option
- Column::toArray() including fixed in output
- Column::setOptions() accepting fixed option
- MigrationHelper::getColumnOption() including/excluding fixed
- MysqlAdapter creating BINARY vs VARBINARY based on fixed option

* Add column type assertions to binary fixed test

* Fix misleading next steps message in upgrade command (#1037)

Only show 'Set legacyTables => false' step after tables have been
dropped, as the upgrade command becomes unavailable once this config
is set.

Fixes #1036

* Fix upgrade command not matching plugins with slashes (#1039)

* Fix upgrade command not matching plugins with slashes

When upgrading from legacy phinxlog tables, the plugin name was being
derived by camelizing the table prefix (e.g. cake_d_c_users -> CakeDCUsers).
This didn't work for plugins with slashes in their names like CakeDC/Users
since the slash was replaced with underscore during table name generation.

This fix builds a map of loaded plugin names to their expected table
prefixes, allowing proper matching of plugins like CakeDC/Users.

Fixes #1038

* Fix test for SQL Server compatibility

* Add TYPE_BIT constant to AdapterInterface (#1013)

* Add TYPE_BIT constant to AdapterInterface

Adds the TYPE_BIT constant mapping to TableSchemaInterface::TYPE_BIT
for consistency with the core BIT type support added in cakephp/cakephp#19223.

This allows migration users to reference AdapterInterface::TYPE_BIT
when defining BIT columns in MySQL migrations.

* Bump cakephp/database constraint to ^5.3.2 for TYPE_BIT support

* Bump PHPStan level +1

* Make props non-nullable

* Add null guards for getConstraint() in BakeMigrationDiffCommand

* Fix nullable return types in Column and ForeignKey

Column::getNull() now coalesces the nullable bool property to
false. ForeignKey::getOnDelete()/getOnUpdate() guard against null
from getDelete()/getUpdate() before calling mapAction().

* Fix null safety in Db adapters and domain classes

Cast preg_replace results to string, coalesce nullable getColumns()
returns, cast nullable getReferencedTable()/getName() at call sites,
and use null-safe operator for optional ConsoleIo.

* Fix remaining PHPStan level 8 null safety issues

Add null guards for constraint diff, fail-fast for null column type,
fix import order, and remaining null safety in BaseSeed, ColumnParser,
TableFinder, and MigrationHelper.

* Replace assert with RuntimeException in AbstractAdapter::getConnection()

Assertions can be disabled in production, which would allow a null
connection to slip through silently. Throw a RuntimeException instead
to fail fast in all environments.

* Use truthiness checks for optional nullable getters

Replace (string) casts with assign-then-check pattern for optional
values that can legitimately be null: Index::getWhere(),
ForeignKey::getName(), Index::getName(), Column::getGenerated().
This avoids silently converting null to empty string.

* Throw on null for required Column::getName() and FK::getReferencedTable()

Replace (string) casts with explicit null checks and
InvalidArgumentException throws for values that must be present:
Column::getName() in SQL generation and ForeignKey::getReferencedTable()
in FK definition builders. A column without a name or a foreign key
without a referenced table are always programming errors that should
fail fast rather than silently produce broken SQL.

* Narrow ForeignKey::getColumns() return type and remove null guards

Override getColumns() in Migrations ForeignKey to return array instead
of the parent's ?array. The $columns property is always initialized as
[] in the constructor, making null unreachable. This is a covariant
return type narrowing, same pattern used for Column::getNull().

Removes the now-unnecessary ?? [] fallbacks from all 6 call sites
across the adapter and plan classes.

* Narrow Column::getName() return type and remove dead null checks

Override getName() in Migrations Column to return string instead of the
parent's ?string. The $name property is typed as string (not ?string)
in the constructor, making null unreachable. This is a covariant return
type narrowing, same pattern used for ForeignKey::getColumns().

Removes now-unnecessary null checks across adapter/action files and
the dead null guard in Table::setPrimaryKey().

* Add null guards for column diff loop in BakeMigrationDiffCommand

Use early-continue pattern to narrow nullable safeGetColumn() return
types before array operations, fixing PHPStan level 8 errors.

* Cast nullable getName() to string for drop FK/index instructions

* Fix phpcs coding standard violations

Remove unused InvalidArgumentException import from RecordingAdapter,
extract assignment out of if condition in PostgresAdapter, and remove
blank line before closing brace in ForeignKeyTest.

* Consolidate null guard conditions in BakeMigrationDiffCommand

* Fix inverted condition in ChangeColumn name fallback

* Accept null in Column::setFixed() for snapshot compatibility

Generated migration snapshots can emit 'fixed' => null for binary
columns, which causes a TypeError since setFixed() only accepted
bool. Widen the parameter to ?bool to match the property and getter
types. Fixes #1046.

---------

Co-authored-by: Matthias Wirtz <matthias.wirtz@hotmail.de>
Co-authored-by: Mark Scherer <dereuromark@users.noreply.github.com>
Co-authored-by: Jamison Bryant <jbryant@ticketsauce.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

CI failures on MySQL/MariaDB since recent dependency updates

3 participants